Drop upstreamed patches

diff --git a/debian/changelog b/debian/changelog
index b69dfdc7fa71b5bdf206cc34f5d5acdefb8182ec..5197b5c660d4579d4de535cb3e5bdfe74015585c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ gnome-shell (50.0-1) UNRELEASED; urgency=medium
     - libgvc/* because 50.beta includes a new snapshot of the subproject
       which includes all those changes.
     - Revert-main-Register-session-with-GDM-on-startup.patch
+    - mixer-control-Only-stream-id-for-bluetooth-devices-only.patch
   * Declare gnome-shell-common breaks old versions of gnome-session-common,
     since the systemd services changed: gnome-shell!3960, gnome-session!167
   * Bump dependencies: gjs >= 1.87.1, mutter >= 50.0

diff --git a/debian/patches/mixer-control-Only-stream-id-for-bluetooth-devices-only.patch b/debian/patches/mixer-control-Only-stream-id-for-bluetooth-devices-only.patch
deleted file mode 100644 (file)
index bff0238..0000000
--- a/debian/patches/mixer-control-Only-stream-id-for-bluetooth-devices-only.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Fri, 6 Feb 2026 18:24:26 +0100
-Subject: mixer-control: Only stream-id for bluetooth devices only
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-They're the only ones that merely flip ports and clearing it for
-other devices breaks e.g. lineout and headphone combinations.
-
-Fixes: 8bf60ee ("mixer-control: Reset `stream-id`s on UI devices")
-
-Bug: https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/issues/40
-Signed-off-by: Guido Günther <agx@sigxcpu.org>
-Applied-upstream: 50.rc, commit:7cfa577a9cdbb018411a97681ab746b55f93fe0a
----
- subprojects/gvc/gvc-mixer-control.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/subprojects/gvc/gvc-mixer-control.c b/subprojects/gvc/gvc-mixer-control.c
-index 4576484..57dc2d4 100644
---- a/subprojects/gvc/gvc-mixer-control.c
-+++ b/subprojects/gvc/gvc-mixer-control.c
-@@ -1218,7 +1218,8 @@ add_stream (GvcMixerControl *control,
- static gboolean
- match_stream_with_devices (GvcMixerControl    *control,
-                            GvcMixerStreamPort *stream_port,
--                           GvcMixerStream     *stream)
-+                           GvcMixerStream     *stream,
-+                           gboolean            is_bluetooth)
- {
-         g_autoptr (GList)        devices = NULL;
-         guint                    stream_card_id;
-@@ -1279,7 +1280,7 @@ match_stream_with_devices (GvcMixerControl    *control,
-                                         in_possession = TRUE;
-                                 } else {
-                                         /* Other UI devices on that card that match the stream can't be valid */
--                                        if (device_stream_id == stream_id) {
-+                                        if (device_stream_id == stream_id && is_bluetooth) {
-                                                 g_object_set (G_OBJECT (device),
-                                                               "stream-id", GVC_MIXER_UI_DEVICE_INVALID,
-                                                               NULL);
-@@ -1390,7 +1391,7 @@ sync_devices (GvcMixerControl *control,
-                 GvcMixerStreamPort *stream_port;
-                 stream_port = n->data;
-
--                if (match_stream_with_devices (control, stream_port, stream))
-+                if (match_stream_with_devices (control, stream_port, stream, is_bluetooth))
-                         continue;
-
-                 g_warning ("Sync_devices: Failed to match stream id: %u, description: '%s', origin: '%s'",

diff --git a/debian/patches/series b/debian/patches/series
index 388d5d4a5309df421f7240a2d345a27e17e9bcf9..8c91da106f1ea1bc45c5b4894d02a5abc06ba7d4 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch
 debian/Revert-tests-Fail-on-warnings-too.patch
 debian/data-Add-im-config.desktop-to-System-folder.patch
-mixer-control-Only-stream-id-for-bluetooth-devices-only.patch